From 251fe5e6644f727d330dbd41242bf79a6acc4568 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 17 May 2017 18:09:59 +0200 Subject: [PATCH] Adwaita: Avoid accindental border on last treeview header The :last-child selector supposed to reset the border was overridden by the :hover selector. This is fixed by moving the :last-child selector after the overriding one. Thanks to Sebastian Keller for spotting. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=779078. --- gtk/theme/Adwaita/_common.scss | 4 ++-- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index e8b6bb9233..5d235b9735 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1859,8 +1859,6 @@ treeview.view { transition: none; //I shouldn't need this } } - - button:last-child { &:backdrop, & { border-right-style: none; }} } button.dnd, @@ -1906,6 +1904,8 @@ treeview.view { background-image: none; } } + + &:last-child { &:backdrop, & { border-right-style: none; }} } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index deb721db85..ce4f6c099a 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -748,8 +748,6 @@ treeview.view header button:hover { color: #bcbdbc; box-shadow: none; transition treeview.view header button:active { color: #eeeeec; transition: none; } -treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } - treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; color: #232729; background-image: none; background-color: #215d9c; border-style: none; border-radius: 0; box-shadow: inset 0 0 0 1px #232729; text-shadow: none; transition: none; } treeview.view acceleditor > label { background-color: #215d9c; } @@ -762,6 +760,8 @@ treeview.view header button:backdrop { color: #626768; border-color: #33393b; bo treeview.view header button:backdrop:disabled { border-color: #33393b; background-image: none; } +treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } + /********* Menus * */ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 95c39ba120..307f698b75 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -756,8 +756,6 @@ treeview.view header button:hover { color: #636769; box-shadow: none; transition treeview.view header button:active { color: #2e3436; transition: none; } -treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } - treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, treeview.view button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; color: #ffffff; background-image: none; background-color: #4a90d9; border-style: none; border-radius: 0; box-shadow: inset 0 0 0 1px #ffffff; text-shadow: none; transition: none; } treeview.view acceleditor > label { background-color: #4a90d9; } @@ -770,6 +768,8 @@ treeview.view header button:backdrop { color: #babbbb; border-color: #e8e8e7; bo treeview.view header button:backdrop:disabled { border-color: #e8e8e7; background-image: none; } +treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } + /********* Menus * */ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } -- 2.30.2